Add support for lttng-ust log4j2 #25
Open
+56
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Kienan Stewart <[email protected]>
kienanstewart
force-pushed
the
log4j2-support
branch
from
bf8a038 to
4749a52
Compare
eepp
requested changes
Feb 22, 2024
vlttng/venv.py
Outdated
| 'log4j-core-{}.jar'.format(log4j2_version), | ||
| 'log4j-1.2-api-{}.jar'.format(log4j2_version), | ||
| ] | ||
| _pinfo('Download Apache {}'.format(log4j2_name)) |
There was a problem hiding this comment.
Just Download Apache Log4j 2 is fine for this info.
vlttng/venv.py
Outdated
| log4j2_version, log4j2_zipfile), log4j2_zipfile) | ||
| self._runner.mkdir_p(log4j2_name) | ||
| self._runner.unzip(log4j2_zipfile, log4j2_name) | ||
| for src_jar, dest_jar in zip(log4j2_jars, self._paths.log4j2_jars): |
There was a problem hiding this comment.
NL above.
Also this zip looks very flimsy. You change the order in log4j2_jars or self._paths.log4j2_jars and this doesn't work anymore. Can you think about some way to infer one from the other?
vlttng/venv.py
Outdated
Comment on lines
748
to
749
| if '--enable-java-agent-all' in project.configure or \ | ||
| '--enable-java-agent-log4j2' in project.configure: |
vlttng/venv.py
Outdated
| @@ -440,7 +453,9 @@ def _create_project_instructions_lttng_tools(self, project): | |||
| def _create_project_instructions_lttng_ust(self, project): | |||
| instructions = self._create_project_instructions_generic_autotools(project) | |||
| instructions.add_env = { | |||
| 'CLASSPATH': self._paths.log4j_jar, | |||
| 'CLASSPATH': "{}".format( | |||
vlttng/venv.py
Outdated
| @@ -440,7 +453,9 @@ def _create_project_instructions_lttng_tools(self, project): | |||
| def _create_project_instructions_lttng_ust(self, project): | |||
| instructions = self._create_project_instructions_generic_autotools(project) | |||
| instructions.add_env = { | |||
| 'CLASSPATH': self._paths.log4j_jar, | |||
| 'CLASSPATH': "{}".format( | |||
| ":".join([self._paths.log4j_jar] + self._paths.log4j2_jars) | |||
There was a problem hiding this comment.
Single quotes.
This whole thing may be just after CLASSPATH: on the same line.
vlttng/venv.py
Outdated
Comment on lines
297
to
301
| return [ | ||
| os.path.join(self.share_java, 'log4j2-api.jar'), | ||
| os.path.join(self.share_java, 'log4j2-core.jar'), | ||
| os.path.join(self.share_java, 'log4j2-1.2-api.jar'), | ||
| ] |
There was a problem hiding this comment.
List of names.
Then
return [os.path.join(self.share_java, f) for f in file_names]
vlttng/venv.py
Outdated
Comment on lines
760
to
750
| self._runner.wget('https://dlcdn.apache.org/logging/log4j/{}/{}'.format( | ||
| log4j2_version, log4j2_zipfile), log4j2_zipfile) |
There was a problem hiding this comment.
Align arguments:
self._runner.wget('https://dlcdn.apache.org/logging/log4j/{}/{}'.format(log4j2_version,
log4j2_zipfile),
log4j2_zipfile)
012385f to
eac40b9
Compare
Signed-off-by: Kienan Stewart <[email protected]>
kienanstewart
force-pushed
the
log4j2-support
branch
from
eac40b9 to
cc1fa23
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.